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

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

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

Change-Id: Id9c1d43e6d117ac77f1917642cf12c2799a6f747