Merge "Apply PiP Params if there was a deferred info." into tm-dev am: 26b096d2 am: 96a5a605

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18380631



Change-Id: I88196e424d64499e9f7d5c2e5896ce4d68cff463
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>