[automerger skipped] Merge "Consider provisioning state when checking if data...
[automerger skipped] Merge "Consider provisioning state when checking if data is enabled." am: 5b2f4776 am: 0e3c8236 -s ours
am: 0fcf841f -s ours
am skip reason: change_id I04edbe5f302bb18cb6d22dcfe293e4ce8b68a700 with SHA1 208662f3 is in history
Change-Id: I0b102658f2331a2a50c458beae9e1edd7941846c