Merge "Consider provisioning state when checking if data is enabled." into...
Merge "Consider provisioning state when checking if data is enabled." into qt-dev am: e95807a1 am: 53cc6ec5
am: abb949af
Change-Id: I1c1a1c7ec0ad89e451c9301004d1477f292ca0dc