Merge "Merge "Using the keyguard fading away duration for the scrim" into qt-r1-dev am: 85224a58 am: 7e564352" into qt-qpr1-dev-plus-aosp