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

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

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

Change-Id: Ifffea83f7a69cbf70dad63bd5afe6afa610fbbce