Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: If754c0b2ec765d62cb24dbe1287c0a14390169df