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