DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: If513af9584f5d1569a1d3357dc4ee9fe44a61f69