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

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

Change-Id: I20b1899446a4597fa3605fde66da4aa1d21a50d5