Merge changes I5e19880b,Ibaed7364 am: 66b8018f0f

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

Change-Id: I5b33ec6cc4412a79f6a8022513d0ff5fad453a89