[automerger skipped] Merge "Fix NPE for UDFPS devices without HBM" am:...

[automerger skipped] Merge "Fix NPE for UDFPS devices without HBM" am: 6893b19a am: 26fedd6a am: c42b1280 am: 876f3281 -s ours

am skip reason: Merged-In Id89552d3228b4770331e0eda558f0f97101ad8ca with SHA-1 e30af88c is already in history

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

Change-Id: I86fd277752d89cff34d60de1f61c7b96c1c16b34