Merge "Various cleanups" am: 5fb746bc9f am: 5684571ed3 am: 4cbf9772c8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I824d28adf2ffecadf6e4ad2629c00c09f7681191