Merge "Include androidx stubs in framework docs"