[automerger skipped] Cherrypick - Fix the NullPointerException when Radio...
[automerger skipped] Cherrypick - Fix the NullPointerException when Radio crash. am: 8fc09eaa -s ours am: c7040bce -s ours
am skip reason: Change-Id If00e3683e5edf5400b6a9d3c9b0d2de0f27acbc8 with SHA-1 abbc5ef8 is in history
Change-Id: If962a36d1dd4fe82ff6d6b043187404fd386df06