[automerger skipped] Merge "Add comments to frozen AIDL API files" into qt-dev...
[automerger skipped] Merge "Add comments to frozen AIDL API files" into qt-dev am: 9388e83d -s ours
am: 25a9b35f -s ours
am skip reason: change_id I983a59d6ecae0c0d49136da723b65a1bb8c9ff53 with SHA1 44657b8e is in history
Change-Id: If0b42bff2809adcf4f2a235891e0f94043d6cdf8