Merge Android10 QPR1 into AOSP master am: 85003cbf47
am: 15c0e7175a

Change-Id: Ib00512599e01416a1158948939f7b2fde583494a