Merge changes I6a62eea4,I599435cc into main

* changes:
  Fix AIDL warnings in Radio HAL
  Move deprecated annotation from structs to their fields