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

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

Change-Id: Ibe7289d478056b15263d013310b8ba11a498c751