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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9a am: d0f5ccb4 -s ours am: 20f8ad98 -s ours am: 357d9ecb -s ours am: 5e90b5cf -s ours am: ef935895 -s ours am: b1cdb2ab -s ours am: d3c697bd -s ours

am skip reason: contains skip directive

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



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