[automerger skipped] Merge "Check user data enabled on phone and add listener"...
[automerger skipped] Merge "Check user data enabled on phone and add listener" am: 2deeb782 am: fde59048 -s ours
am: 9ca12c24 -s ours
am skip reason: change_id I599bea363f24a3de0e102c2e32cad132dcc0bbec with SHA1 86d02753 is in history
Change-Id: I8165a4e29ab3dd388e3c6f8996d8a2a6fb8a605d