Merge "Merge "Add a Setting for whether or not we have been disabled by...
Merge "Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev am: a48cf1e6" into oc-dr1-dev-plus-aosp
am: 0398a0d1 -s ours
Change-Id: Ie7dcdd583791b1828d09af35a33646e50b9cbc64