Merge "Expose androidx-current for doc generator"
am: 0a88e5639c

Change-Id: If57fd21a593d29f280c9612b5d2562ecf0faef0f