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

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

Change-Id: Id70f2a2b18bce22fbe7602a2ea70da7f78350b77