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

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

Change-Id: Icd89e45859b574d8cd300241d6c4f45541cb5cb8