[automerger skipped] Merge "Merge "Properly handle HSUM no-user in the...

[automerger skipped] Merge "Merge "Properly handle HSUM no-user in the ContextHubService" into udc-qpr-dev am: 66224219" into udc-qpr-dev-plus-aosp am: 1dc42da0 -s ours

am skip reason: Merged-In I1d24b1cfe2222868670e4b8569229f1ed0ad378b with SHA-1 8ff589c9 is already in history

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



Change-Id: I4bee89a0a15c06e3cca373c598a0907b5ea2e570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>