[automerger skipped] Merge "Fix one more import for ContextThemeWrapper." into...

[automerger skipped] Merge "Fix one more import for ContextThemeWrapper." into sc-qpr1-dev am: 1bc5c4fe am: abeb3d92 -s ours am: 4ec11441 -s ours

am skip reason: Merged-In Ie14285b614318a99098f4457d7564a25724cde6b with SHA-1 fff8e219 is already in history

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

Change-Id: I305d435555ee22affe19b025b841033c4f27cedc