Merge changes Ibd460229,I589668ef am: 7815893786 am: 00e983df29

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

Change-Id: I33d2fe802c8c063f39b8bcaa630bdefcdd88129d