Merge "Annotate ODI_CAPTIONS_ENABLED with @SystemApi"