Merge "Fixing Material Tokens inheriting wrong theme" into udc-dev am: 7c0ec937

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



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