[automerger skipped] Check user data enabled on phone and add listener am: 2298118d
am: 21c30fd2 -s ours
am skip reason: change_id I599bea363f24a3de0e102c2e32cad132dcc0bbec with SHA1 86d02753 is in history
Change-Id: I7c8d8b10a4d8e096206971aef26e08601c80bd0f