[automerger skipped] Merge "Stop exposing reasons through phone state listener" am: 26ebccdcff am: d05f403adc
am: 4d3d43d006 -s ours
am skip reason: change_id Ia005abf19664e6213118ee932495950af118456d with SHA1 4d1c945000 is in history

Change-Id: I380ecc6ce8c106c9c9d5e14567eac06125282f92