Merge "Revise manifest for adding trampoline activity" into tm-dev am: 25d017c0 am: 1b291e05

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



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