Merge changes from topic "thirtytwo" am: ab05f6310d

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

Change-Id: I4fb548eb4997daeb03999dacd71ea2e073c472fc