Merge changes If73b3e9f,If67bf4ff am: b87fef9c32

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

Change-Id: I63bc66c647f5de63e2fc9087f7c48d826982f155