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

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

Change-Id: I7f63798666cc406c8b9cd53739b6cda82d3d3a24