[automerger skipped] Merge "Apply Glif theme before using dynamic color." into tm-dev am: 578f3bea -s ours

am skip reason: Merged-In I04d33a769845e631b9aeff3e343a9c5109b4c92d with SHA-1 fa4317c8 is already in history

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

Change-Id: I5deff79f7f96acfe30dd214cb173a0ce54767d59