Merge "Prevent nesting of ContextThemeWrapper" into sc-qpr1-dev am: 98fa7d142f am: 03b3d82793

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

Change-Id: Ide898efea2d4a9b3a79fc92fd5ac947ef3adc39e