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

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

Change-Id: I7888a9c5d291d84ff87c248cf45ab49f98fa2987