[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: 0a4ee223 -s ours

am skip reason: contains skip directive

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



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