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

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

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



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