Merge "Add a Setting for whether or not we have been disabled by policy." into...
Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev am: a48cf1e6
am: 932f3605 -s ours
Change-Id: I725fca68477839d764812689861ecfa4ae663bd9