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

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

Change-Id: I3e86b3e9cdd6794882ce4e83a20a801abca8ae70