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

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

Change-Id: I755af1d94210dbe5d79258a970a3d274c2145798