[automerger skipped] Merge "Check user data enabled on phone and add listener" am: 2deeb782
am: fde59048 -s ours
am skip reason: change_id I599bea363f24a3de0e102c2e32cad132dcc0bbec with SHA1 2298118d is in history
Change-Id: I7859d48cef20af08211e6034096131a2d3e3f912