[conflict] Merge "Fixing Material Tokens inheriting wrong theme" into udc-dev am: 406f45f9

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



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