Merge changes Ic82ffd2f,I29632003 am: fd593414cd

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

Change-Id: I9730fdf7e5e43ad17a2c571bc35b82aa84a6fb55