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

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

Change-Id: Ic430f7836a43f7d462808b3dd0a2c77e78a574cb