Merge "Stop exposing reasons through phone state listener" am: 26ebccdcff
am: d05f403adc

Change-Id: I12080acebc37dc496f9b016784fc8ef6e611f1d4