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

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

Change-Id: I67197802aac592f4827e1defb228d66aef60a1ca