Merge "Merge Android10 QPR1 into AOSP master" am: 249b9509db am: 4e59b0be1a

Change-Id: I3d0ad620c2ee36e6818ef5b2d79fe0d6ab17164d