[automerger skipped] Merge "Fixing Material Tokens inheriting  wrong theme" into udc-dev am: 7c0ec937 am: 121f0e69 -s ours

am skip reason: Merged-In Ifa3338785f87484c9aa2322768b4ebfc61be1f95 with SHA-1 0c1c9150 is already in history

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



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