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

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

Change-Id: Ia0c7b71475b15259c1bb001f6f00f4de79c03522