Merge changes from topic "am-87ccba4480374e9fb46f4c8d8e3052f7" into...

Merge changes from topic "am-87ccba4480374e9fb46f4c8d8e3052f7" into udc-qpr-dev-plus-aosp am: f3095c77 -s ours

am skip reason: Merged-In I770dc5620648df2eab608e030c5e76cf190f315d with SHA-1 a47d46af is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2782369



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