[automerger skipped] Merge "RESTRICT AUTOMERGE Use getLaunchedFromPackage...

[automerger skipped] Merge "RESTRICT AUTOMERGE Use getLaunchedFromPackage instead of getCallingPackage" into tm-qpr-dev am: b3787ccb -s ours am: 330bbda9 -s ours am: d5d46bee -s ours

am skip reason: contains skip directive

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



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