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

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

Change-Id: I6bc37dde0fa87402e944d4ec0c431c17c5dfa85b