[automerger skipped] Merge "Fix broken launcher build to use the right import for ContextThemeWrapper." into sc-qpr1-dev am: 2ae305234d am: 04cfc450b7 -s ours
am skip reason: Merged-In Ia36b77e3274191efa28c87cc0b2604a66906b604 with SHA-1 2ee44db719 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15713463
Change-Id: I450585798af27a53639ea7cdb314d43d723866d2
This commit is contained in: