Merge "[automerger skipped] Merge "Resize PiP on display density dpi change"...

Merge "[automerger skipped] Merge "Resize PiP on display density dpi change" into tm-d1-dev am: 1061cb16 am: 721fa921 -s ours" into tm-qpr-dev-plus-aosp am: e0fcf466 -s ours

am skip reason: Merged-In I9797197a63ed9574caaba7319d0b058821bdab36 with SHA-1 7e36bd25 is already in history

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



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