Merge changes I390aa702,I9084343c am: 0c77e4d25a am: 35f97c33b6

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

Change-Id: If89769d48bcb14713a84d92611bc38894cdccb49