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

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

Change-Id: Ic3b8aff764e92ec5a48cd53ab1106b6754ac6625