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: 9fb34ae3 am: ac596479

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



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