Merge "Moved RilRadioTechnology annotation" am: d031947100 am: 11caff98ff

Change-Id: I0cf1626bd1588a48f092fc7d2ae717251a7f4240