Merge "Protect UnlaunchableAppActivity against overlay attack" into tm-dev am: 9c9916e4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18197412



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