Merge changes I3642c6eb,I0cf9c1ce am: 687ffed8f6 am: eca75b0037 am: af620c1226

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

Change-Id: I472e0491a9b802972d3e20e426b2fd0666b1959c