[automerger skipped] Merge "Remove hidden setRadioIndicationUpdateMode in TelephonyManager" am: 3809ad8510 am: 270c867a6f -s ours

am skip reason: Change-Id I529dc1a743729ae5044ade7fcb6d37b43c571685 with SHA-1 4a94fbdfdf is in history

Change-Id: I198fa6c640435e875ee97deba85eaf100d161e4d