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

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

Change-Id: I4c29004eaa89452a0702e37fa6f3ba47f871542b