Merge changes Ifeffea05,I966f65a1 am: 104192c28f am: ca40766dd6 am: c0bceee092 am: d038448af8

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

Change-Id: If3fb99d21670277bcf99f54d7f064d792e4ee0cc