Merge "Moved RilRadioTechnology annotation"
am: 1945137f47

Change-Id: Ib0a4766d56ce755015ce528d904c6359a17edf8f