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

Change-Id: I81f44a4c127309e7358d4aadb6148d6448ff55a6