Merge "correct the definition of LISTEN_RADIO_POWER_STATE_CHANGED" am: 2c10a29eaa
am: fd6cccc775

Change-Id: I45f482ad6b57cc3ff7c5f125f5f98f748f54063c