[automerger skipped] Merge "Moved RilRadioTechnology annotation" am: d031947100 am: 11caff98ff am: 59ddb32fde -s ours
am skip reason: Change-Id I2411052465204d87cb5982102df0fd1af012a97c with SHA-1 d75d5344f4 is in history

Change-Id: I3164f65d472b1b5a38b156b78fa7ff7fb303a313