[automerger skipped] Merge "Remove hidden setRadioIndicationUpdateMode in Telephony" am: 7dbf2457 am: c06a4f5d -s ours
am skip reason: Change-Id I2084c546e02282170a69bc872c574ff070911244 with SHA-1 1392769b is in history
Change-Id: I0fc0489a7a5c9f546f92095456d9e510a82eee82