Merge "[automerger skipped] Merge "Add comments to frozen AIDL API files" into qt-dev am: 9388e83d7f -s ours am: 25a9b35f34 -s ours am skip reason: change_id I983a59d6ecae0c0d49136da723b65a1bb8c9ff53 with SHA1 44657b8e19 is in history" into qt-r1-dev-plus-aosp