Merge changes from topic "thirtytwo" am: ab05f6310d am: 327be8c123 am: 99097b0f72 am: 3519518dc1

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

Change-Id: Ia793a6173534e1afca717ffaafc3ef384b0e05da