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

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

Change-Id: Iea6c5ec5389cac49940b75bae9e66dfa50a612b7