[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: 9e311f36 -s ours am: 4c59ec6e -s ours am: 296a7877 -s ours am: 1d5135af -s ours

am skip reason: contains skip directive

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



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