[automerger skipped] Merge "Added new...

[automerger skipped] Merge "Added new testNotifyCellLocationForSubscriberByUserSwitched" am: 93cc1d53 am: 062a26cd am: 340e9f6d -s ours am: 76bab013 -s ours

am skip reason: skip tag Change-Id I111eb3569b6f30d0ca5bb50a9e04770a1f04fdd7 with SHA-1 6121a24c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1552066

Change-Id: I19afe772f3f95b8e8f1c622e485aa60d8039ee2c