[automerger skipped] Merge "Remove hidden setRadioIndicationUpdateMode in...

[automerger skipped] Merge "Remove hidden setRadioIndicationUpdateMode in TelephonyManager" am: 7aae0766 am: bff28a86 -s ours am: b67e2ce2 -s ours am: be5469bd -s ours am: 73f1150d -s ours

am skip reason: Change-Id I0bce99b5363392bbaf9cf76dad8c1b47a138fd19 with SHA-1 4b779449 is in history

Change-Id: I8e9ac875f7fe7009655b37c1440bc66295ef8623