Merge "Merge "Override application display adjustments while launching...

Merge "Merge "Override application display adjustments while launching activity" into rvc-dev am: 1421b3da am: d8eb1df3 am: ababf892" into rvc-qpr-dev-plus-aosp am: 4329f7c6

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

Change-Id: I72e8bea70d994c2e38b0949631b76caa02bec5c2