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

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

Change-Id: I03ab9d0df56a8e939b11d45d0401566f937a4959