Merge changes from topic "revert-1431616-thirtytwo-QKCUUIXLZL" am: 4737502679 am: 7fe9553d96 am: 786b335242 am: efb41275bd

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

Change-Id: Ib16b8ee6fe107e63fc054f26992e779e1a56bda9