[automerger skipped] Merge "Add comments to frozen AIDL API files" into qt-dev am: 9388e83d7f am: 099b28e06b -s ours
am: 4f7af58f45 -s ours
am skip reason: change_id I983a59d6ecae0c0d49136da723b65a1bb8c9ff53 with SHA1 44657b8e19 is in history

Change-Id: I3a97f0972b2dbb499add44dcec98290bdf81c56a