Merge changes Ic84efbde,I7c1c6044 into sc-dev am: c9eccc49be

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a12c1675e6078f6c86650be0ba2857d14cca792