Merge changes I10c4beea,I0efc30f3 am: cad5403270 am: 151917bb54

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

Change-Id: Iab9a1eb665b4e2ded80cb8d26ad9d27fd2c4eb35