Merge "Moved RilRadioTechnology annotation"
am: d031947100

Change-Id: I2d52c03374a8395dc9fb5fefc6eaeb863162f342