Commit b5ce68cd authored Jun 18, 2021 by David Drysdale Committed by Automerger Merge Worker Jun 18, 2021

[automerger skipped] Merge changes I5e19880b,Ibaed7364 am: 66b8018f am: 2b6e3bb6 -s ours

am skip reason: Merged-In I11d28d71676d44ebdc79b25b2eb70947022bb1cf with SHA-1 66ab046f is already in history

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

Change-Id: I0dca4f3e8045725e304a0433a140832f0b98adb8

There are no changes