[automerger skipped] Merge "Fix broken launcher build to use the right import...

[automerger skipped] Merge "Fix broken launcher build to use the right import for ContextThemeWrapper." into sc-qpr1-dev am: 2ae30523 am: 04cfc450 -s ours am: 42f998d9 -s ours

am skip reason: Merged-In Ia36b77e3274191efa28c87cc0b2604a66906b604 with SHA-1 2ee44db7 is already in history

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

Change-Id: I0684bb0a02ce083a7eed6cfce45b1ea58e5f36e3