Merge "Fix NPE for UDFPS devices without HBM" am: 6893b19adc

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

Change-Id: I715fd67585d6163a3de8d5bcc940698754c25b22