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

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

am skip reason: Merged-In I48adb14fbc8d5f2f2e21ef8a30a713d33f03ab02 with SHA-1 8f75fbaf is already in history

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



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