Merge changes from topic "revert-1433252-revert-1431616-thirtytwo-QKCUUIXLZL-QJYJJALHBY" am: 51dc008bd3 am: 359970caaf

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

Change-Id: I210c10e0c63e46ae4cf8c0d16b20c970c9768395