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

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

Change-Id: Ie30e61029ba87e0c0f5cedc18683891502ae5b05