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

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

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

Change-Id: Ia303f44c62152c94f062523109b2d73dbb558356