[automerger skipped] Replace getCallingActivity() with getLaunchedFromPackage() am: ddc11bc03a am: 930a9f3180 am: 19ae28f1eb -s ours
am skip reason: Merged-In If97018c2741caef622f0596bbfeaa42ef1788b78 with SHA-1 ddc11bc03a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26315861
Change-Id: Id28f4025a6181006202980760ee93b55c253b078
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: