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

[automerger skipped] Merge "RESTRICT AUTOMERGE Use getLaunchedFromPackage instead of getCallingPackage" into udc-dev am: 1ccb9c89 am: f3066662 -s ours

am skip reason: contains skip directive

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



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