Merge changes Ibd460229,I589668ef am: 7815893786

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

Change-Id: Ia9887ecbd116066d9f9549986bf2c99730e30171