[automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274
am: d0a4db88bb
-s ours am: e0b4c24d20
-s ours am: 8e61964dec
-s ours am: 19019740e0
-s ours am: 2e2afe97df
-s ours am: ebace9614a
-s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218 Change-Id: Ifad6b769039877dd9b7da369ceefb55f5af6c7bb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: