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



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