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

[automerger skipped] Merge "Resize PiP on display density dpi change" into tm-d1-dev am: 1061cb16 -s ours am: aff48311 -s ours am: 9d479175 -s ours

am skip reason: Merged-In I9797197a63ed9574caaba7319d0b058821bdab36 with SHA-1 23e05492 is already in history

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



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