tree 0ec013b648cebf24d9a5c442df5eb532799df28b
parent 65c1ecb96172228ae18e60c7c56f0049e07703aa
parent 1e6ce31142dc920f43c1f5f189d3a23cfc9bc6dc
author Xin Li <delphij@google.com> 1575350721 -0800
committer Xin Li <delphij@google.com> 1575350721 -0800

Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I5a65313b57eebc617c8c8805df8b6c9967f2fdd2