Merge changes Ibfb6a54c,Ifa0f95fd am: 4af9762ef7 am: 1eb867fc2f am: b6b6d6151c

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

Change-Id: I8129b635e8adea0d0d538370decd3590eab1ab55