[automerger skipped] Merge "Fix the radio on handling logic." am: 3b80031b am: 361efc51 -s ours
am: 2782ed98 -s ours
am skip reason: change_id Ie73716a1a5125da93e6f5deac1692853c05bed78 with SHA1 9e969a91 is in history
Change-Id: I77f08fa8a917055170220254b02714c542c2ba36