Merge changes Ic82ffd2f,I29632003 am: fd593414cd am: 869d9061c9

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

Change-Id: I7c1414f3b42b0d483e8fb5a0279f877c2dd2ae9d