[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 -s ours am: 6263d14a -s ours

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

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

Change-Id: I2c09b77e795b769ed46eec360cd2a589c1a1c5bf