Merge \"Disable \"disable\" button for the device provision app in the Settings app\" into nyc-mr1-dev
am: 8aee45afb6

Change-Id: Ic6fb6f14c8375acd1b0395ad879ae4868e7f7c79