Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4."...

Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c0 am: 434e728b am: 033a744c am: a64a7640

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029



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