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