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

Change-Id: I7dcd7e65a817eed970b123261b4871e5f7d293dc