Merge "Merge "Remove MODE_UNLOCK_FADING since it's no longer needed" into...

Merge "Merge "Remove MODE_UNLOCK_FADING since it's no longer needed" into tm-d1-dev am: 0596a705 am: a36f784a" into tm-qpr-dev-plus-aosp am: b09cfedc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18368628



Change-Id: I0c145d91ff77921eff6462a26db7cf5a0a59e65d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>