Merge \"Disable quiet mode after UserManager.trySetQuietModeDisabled() is unlocked\" into nyc-dev
am: 6f1ed200b3

Change-Id: Ib9f627511c46a1e23c02e73a008edf264dc01f79