Merge "Fix UDFPS not working when a HUN is showing" into sc-v2-dev am: cb4a25f6df

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

Change-Id: Ia4b0e060dbb008ab73d5507a38bb47e19a11436f