Merge "Expose androidx-current for doc generator"