tree 205ac67d113e93bd3692691a12cec4a5dfdc6ece
parent 6d884accfee5fd9c9d260391b81c1962cbc6a8c1
parent 0960860726b7dffd1f25132597b9f61e21b2a7be
author Treehugger Robot <treehugger-gerrit@google.com> 1668728035 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1668728035 +0000

Merge changes I2dfd304c,I978432e2 am: a335badc22 am: 509d54d0d4 am: 0960860726

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

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