[automerger skipped] Merge "Don't require merge_annotations_dir for...

[automerger skipped] Merge "Don't require merge_annotations_dir for annotations_enabled" am: 5ac7fad7 am: 823b9182 -s ours am: d5c3d2b5 -s ours

am skip reason: Change-Id I6705522774203b4566f58679bbc2f0c17422c1dd with SHA-1 c5e13279 is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324607

Change-Id: Ic3011f62ec677fb0e6b51b18cfff1a5a71b37666