Merge changes If73b3e9f,If67bf4ff am: b87fef9c32 am: f92be0673d am: de5e723318

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

Change-Id: I080b402e316bd135619fe599c78da1595e1a6500