Android 9.0.0 release 20
Merge "Remove clang: true" am: 3080778f3b am: b979f180ce
am: 971cbb62ea

Change-Id: I373c4dcedaac984f137f9a6100f3254da72e1054