Merge "Moved RilRadioTechnology annotation" am: 1945137f47 am: adb90684b5

Change-Id: I52bd58dccb1cb8f91472aee81e99c9fcf1f811c8