[automerger skipped] Merge "Connect IRadioConfig 1.1 HAL interfaces with RadioConfig.java" am: 5c1968475c am: 112d88e592
am: 8718e42d68 -s ours
am skip reason: change_id I2a198d446962510ef9a3019d3aa30b40e796ebe0 with SHA1 13caf061d6 is in history

Change-Id: I23ba10d388222617b3a7c6f1038f37e165bef192