Android 10.0.0 release 3
Merge cherrypicks of [9310902, 9310903] into sparse-5800535-L11300000360646808

Change-Id: Ie5f9475ad719c5fece5368614e33eafff1dd3ff7