Merge "Add managed profile setting page" into nyc-dev am: d5b3a5d342
am: b8cfa32bf1
* commit 'b8cfa32bf1a91757002ce8e7dd7c134d9a57d6de':
Change-Id: I54f81ebdc56bc6f937a11e62cee1a70f3dd622f0
This commit is contained in: