Merge "Add comments to frozen AIDL API files" am: 714b313903 am: 85db764efe
am: 44657b8e19

Change-Id: I514b7dc9f90b8a72e029d96c872857ab654f9a85