[automerger skipped] Merge "Merge "Don't allow background apps to change...

[automerger skipped] Merge "Merge "Don't allow background apps to change theme" into sc-dev am: d47e6d84" into sc-qpr1-dev am: df4bc358 am: 52d5d43a -s ours am: 58822e04 -s ours

am skip reason: Merged-In I2086b29ef9bf3bb6fb7d9ebba6e7b8db9392e459 with SHA-1 efaa814a is already in history

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

Change-Id: I6ba1e559fe2d295a49adc446607462afa5acb636