Merge "Add aurimas as the owners of the android.annotation package" am: b65218c561 am: 001cf41de5 am: ba109b3f30

Change-Id: I28596883b3369c1bf3ba2bcd55afc0ac14780978