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: 37c36d0c am: 3935ea32 am: 96b8ee8b

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



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