[automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity()...

[automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b1 am: a339d8ea am: ffb480ae am: ba599569 -s ours am: ebefb837 -s ours am: 6f4a788f -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27712008



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