[automerger skipped] Merge "Load UGD dependencies from SPHAL on non-VNDK...

[automerger skipped] Merge "Load UGD dependencies from SPHAL on non-VNDK devices" into main am: 90174054 am: 5245b805 -s ours

am skip reason: Merged-In Ic4451ef1197b4bd2111052505299409376756a00 with SHA-1 0cdac9a4 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3220824



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