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

[automerger skipped] RESTRICT AUTOMERGE Use getLaunchedFromPackage instead of getCallingPackage am: 4ebc9c8d am: 2f312198 -s ours

am skip reason: contains skip directive

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



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