Merge "Fix HAL and AIDL files to be consistent with API generation tool." am: 650dc957ee am: df56bdcee9 am: 159bc14bad

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

Change-Id: I0a8d9ad1344fb0f67bdde7dbff4078d5660ac055