[automerger skipped] Merge "Stop exposing reasons through phone state...
[automerger skipped] Merge "Stop exposing reasons through phone state listener" am: a333194d am: 536425de
am: 5d520b82 -s ours
am skip reason: change_id Iae3659bdb35d2a52c289f4e58b3f975114a7a556 with SHA1 82f7e029 is in history
Change-Id: Ia30c846ad27efe01a2f1015377a5759a493dc61c