[automerger skipped] Merge "Fixed an issue where using UDFPS always dismissed...

[automerger skipped] Merge "Fixed an issue where using UDFPS always dismissed the shade" into sc-qpr1-dev am: bd69c2fd am: 0a790fe5 -s ours

am skip reason: Merged-In Id8bf8460bff26ec5694c82466ea63e3cdf61216e with SHA-1 703c9e5c is already in history

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

Change-Id: I336a2507de881b7fdd3550506a0dfb6041d515fe