Merge "Protect UnlaunchableAppActivity against overlay attack" into tm-dev am: 9c9916e4d9 am: 3327a4c0d7 am: 2cd75b7fdb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18197412 Change-Id: Ie4384daba29affdd8980a35cc17e5d0169d7166e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: