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

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

Change-Id: I05b2c53120219300413e6c3107b3120c0cf69cf5