[automerger skipped] [automerged blank] Fix brokn theming test 2p: 6d8acfba32 am: 02848f68d6 -s ours am: 42f26662f6 -s ours

am skip reason: Merged-In Ibb2a730280a25b39cac96415de8b82430843064b with SHA-1 e6e0a6c49b is already in history

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

Change-Id: Ia3f128052d4c377b5117068f3c659e0ddebd0e9f