Merge "Don't allow background apps to change theme" into sc-v2-dev am: a6f7644ef0

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

Change-Id: Ia566b6199eee6fa35ac8b978ae20d7223c85c9e5