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

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

Change-Id: Icd2085d4f5a425067c13d0e6b161bfc560b18624