tree d3fb6a41d6db0f3efcce4579c7ec68bee29015c4
parent f8024383614819374fce1c4ceea64b5db59a9ef6
parent 5f14bad22cb3393dfa0e6ca132eecd050d676b56
author Michael Butler <butlermichael@google.com> 1635294055 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1635294055 +0000

Merge changes Iae9f692f,Ib43f1cb6,I9d4f0c30,I7d06ea35 am: 5f14bad22c

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

Change-Id: Ie2dadd254c67ca24e7350b5e6d7e501c8bc6d703