[automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218 Change-Id: I126a187cd8b358a2f5f0bfad8ebf2f7eec5665c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: