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

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



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