[automerger skipped] Merge changes I5e19880b,Ibaed7364 am: 66b8018f am:...

[automerger skipped] Merge changes I5e19880b,Ibaed7364 am: 66b8018f am: 2b6e3bb6 -s ours am: b5ce68cd -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: I1617c4a33b71583624fb7a8c6cdcdc1e8d510307