tree ec61041a852ca4221d489968a2de2fdb4a317816
parent e52c1bb00789397fbacc0b4399da7d62df706bcd
parent 8ec315a25e18786322a684fd430f3260e0543807
author Kris Alder <kalder@google.com> 1625762004 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625762004 +0000

Merge changes I580e3f1d,I8e271982 am: 8ec315a25e

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

Change-Id: Id5138a91c4e81ee86b72447ebc5d0a8249a8a872