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