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: I81195b7c5e33160659704d7b7dcf27c203ce7f4c