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

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

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



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