Merge changes If73b3e9f,If67bf4ff am: b87fef9c32 am: f92be0673d am: de5e723318 am: 8572aae3f6 am: 310b385a01

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

Change-Id: Ib227541bb3fa496a77294dac3e39045235358766