[pull] main from google:main#33

pull[bot] merged 2 commits into

Android-studio61:mainAndroid-studio61/adk-docs:mainfrom

google:maingoogle/adk-docs:mainCopy head branch name to clipboard