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
am: 56a3d8fb1b

Change-Id: I3676993a59a61f6eb8660445b7f026847debe3e2