Merge "Clean up android.hardware.common types" am: c26ba2dd21 am: bcf7751dcd

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

Change-Id: Ia4352e919f18876c5e7294c3f69f46c923f82776