Merge changes Ifeffea05,I966f65a1 am: 104192c28f

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

Change-Id: I3922ab4a1f5b63f84ea7094b3f5f062d03af2683