[automerger skipped] Merge "Moved RilRadioTechnology annotation" am: 1945137f47 am: adb90684b5 am: 062e1cecf4 -s ours
am skip reason: Change-Id I6c81aa56c94314cbf264f1808571a14c77979281 with SHA-1 f1445bb181 is in history

Change-Id: I0d07152e5552b0bfcd9716161e08fe0978be585c