Merge "[automerger skipped] Merge "[TelephonyMainline] @hide system api since...

Merge "[automerger skipped] Merge "[TelephonyMainline] @hide system api since we'll revisit in S - Cdma" am: eff8e993 am: e761439f -s ours" into rvc-dev-plus-aosp am: db3786d5 -s ours am: ad55513b -s ours

am skip reason: Change-Id I83dbaa24f94f5cca846d6ca71c7e6814ecd832b8 with SHA-1 834b281f is in history

Change-Id: I662758026db2842fa96477623ca14849af8f0196