[automerger skipped] [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d
am: a339d8ea9a
am: ffb480aee4
am: ba599569fd
-s ours am: ebefb83789
-s ours am: ebf3f4cee6
-s ours am: 915d38372e
-s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27712008 Change-Id: Ib1485864df8e23fa821b21af735b10a70f2dc380 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: