Merge "Rename setDataEnabled to setUserDataEnabled." am: 43b1b97e3e am: 5e90d8ea7a
am: e99f20cd95 -s ours
Change-Id: I941272824a99adbbc86653c02551e2a93440f887
This commit is contained in: