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