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

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

Change-Id: I151f1e600fb39edb651bd0df9f699c3631c6bf90