[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 skip reason: change_id I04edbe5f302bb18cb6d22dcfe293e4ce8b68a700 with SHA1 208662f3 is in history
Change-Id: Ib0f48f49adda52b19ebdc6717cbac5e03d3d3e0c