Merge "Merge Android10 QPR1 into AOSP master" am: 52d459b645 am: 399696806d

Change-Id: Id452f23282898cef1fcc61c6383fc7b99ac2d0f1