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

Change-Id: Id2ace57694b50077b32c2092dda6eba86ff8c2ce