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

Change-Id: I983a59d6ecae0c0d49136da723b65a1bb8c9ff53