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

Merge "Override application display adjustments while launching activity" into rvc-dev am: 1421b3da am: d8eb1df3 am: 90963596 am: a915e3da

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

Change-Id: I557a1e4aff677b0b51766bf9a5cb2ba1c6fb481c