[automerger skipped] [conflict] Merge "Fixing Material Tokens inheriting  wrong theme" into udc-dev am: 406f45f9 am: c17ca1f5 -s ours

am skip reason: Merged-In I235af7899bc814a2910e6196c2f195ebc711d6bb with SHA-1 d32de876 is already in history

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



Change-Id: Ia6958b0c8178ad1a8437b1ea2ec7c5e146a015b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>