Merge "Do not set the state to POWER_OFF when in APM for ImsPhone" am:...
Merge "Do not set the state to POWER_OFF when in APM for ImsPhone" am: 63a4e77c am: 2e4aad90 am: 63a9b20d -s ours
am: 9ae580de -s ours
Change-Id: Ic77f8676b6727ec6c325062dedacba904590d346