[automerger skipped] Add support for annotations in module_sdk am: d4812d8fa2 am: 7e572769fb am: f6d915419f am: 41a26b4eb1 am: 5e66854b8c -s ours

am skip reason: Merged-In I8fe64ebb4dd16da9ee555506d7a1d64122162307 with SHA-1 a6bdc3db0d is already in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/1856179

Change-Id: I72176fb2226e2ebf226979e1a85a07310561040c
tree: 67dd4a548e739cf541fd2203a1857dab25a7fc27
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS