Merge Android10 QPR1 into AOSP master
am: 57432d6ccf

Change-Id: I67b0772da68c55e4b2a67d039f8ea00b6d80c50e