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

[automerger skipped] Merge "Don't allow background apps to change theme" into sc-dev am: d47e6d84 am: 52ca52db -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/+/16241430

Change-Id: I3a51dd1c0cdf9909ac82266352df143834a2a890