tree f859b5429ee469fac3a389e9b64f27f729695968
parent 54068d9df2ff8db67736695f0000c54f6a367548
parent 869d9061c9ee0a23ca8dd00ecf5d1f3e0e45b165
author Sarah Chin <sarahchin@google.com> 1641507831 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641507831 +0000

Merge changes Ic82ffd2f,I29632003 am: fd593414cd am: 869d9061c9

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

Change-Id: I7c1414f3b42b0d483e8fb5a0279f877c2dd2ae9d