Merge "Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev am: 04ad8c905a am: 3ed75c8478" into qt-qpr1-dev-plus-aosp
am: 14dfab3981

Change-Id: I2f336f8d2aac17c89d013d081cf9b8bd586c4c2c