Merge "Remove hidden setRadioIndicationUpdateMode in TelephonyManager" am: 3809ad8510

Change-Id: Id22d6d21e26cdbd059257360fb624d8305d5e6c1