Merge Android10 QPR1 into AOSP master am: 584b337f74
am: df9eb90b59

Change-Id: I669df2e0d00fe5a07343d7b6364c58bc26dd413d