Merge "Fix gravity after re-enabling expanded PiP" into tm-dev am: 6cc02e8d am: 6cc23462

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



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