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

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

Change-Id: I406ba5022f87ca00a0b809c573bc5299ac8c22ab