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