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

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

Change-Id: I3f85763361bbaabb3ea964ba06866ac25f9b76f6