[automerger skipped] Merge "Remove hidden setRadioIndicationUpdateMode in TelephonyManager" am: 7aae0766 am: bff28a86 -s ours
am skip reason: Change-Id I0bce99b5363392bbaf9cf76dad8c1b47a138fd19 with SHA-1 4b779449 is in history
Change-Id: I53077b3821ef0f8195b86233f167f7f518b5571d