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

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



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