[automerger skipped] RESTRICT AUTOMERGE Use getLaunchedFromPackage instead of...

[automerger skipped] RESTRICT AUTOMERGE Use getLaunchedFromPackage instead of getCallingPackage am: 85987ea1 am: 7cf6bd55 -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: Ic38a0d2a3be32891273bf244b4b35981910900b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>