tree 12a98c8bd815bca9ed4f6afe68fad911491771a4
parent 1990eb31345a06b23b9baa774715dbc17dbbd397
parent e34278368755127110d26fddb2d48da535c79622
author Xin Li <delphij@google.com> 1575350701 -0800
committer Xin Li <delphij@google.com> 1575350701 -0800

Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I0ee6537a166333d364a2fef61cbf08dfaf00cfb9