Android 10.0.0 release 34
Merge cherrypicks of [10875851] into sparse-6337963-L38000000510313961

Change-Id: Ifb19380cb6e668c0c0b8d09966f9caa21c369152