[various] Scrubs pre-SDK-21 Android code#9112

auto-submit[bot] merged 9 commits intoflutter:mainflutter/packages:mainfrom

stuartmorgan-g:android-pre-21-scrubstuartmorgan-g/packages:android-pre-21-scrubCopy head branch name to clipboard