Merge "Expose androidx-current for doc generator" am: 0a88e5639c am: 16eb29a168
am: 256fb476f5

Change-Id: I66a9fd1a09eb6d335bc8004c81dda43bc33a46d8