Merge changes from topic "thirtytwo" am: ab05f631 am: 327be8c1 am:...

Merge changes from topic "thirtytwo" am: ab05f631 am: 327be8c1 am: 99097b0f am: 3519518d am: 7902b45f

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

Change-Id: Ic430f7836a43f7d462808b3dd0a2c77e78a574cb