Merge "Fix one more import for ContextThemeWrapper." into sc-qpr1-dev am: 1bc5c4fe62

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

Change-Id: I2bcdd0beb16d12bc21506bba1a7354f82b8a152c