Merge changes I3642c6eb,I0cf9c1ce am: 687ffed8f6

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

Change-Id: Ie1e6e1e281d0b7075379f36f97f32c03c6884f5d