tree 2a6d48ff485fc45324992463a1fe7c0205943866
parent 3908351777900699e377526b4645f92effbced60
parent 6b30bf8a7f1a56b8db44d9d436d5f7c140bb506a
author Xin Li <delphij@google.com> 1575350707 -0800
committer Xin Li <delphij@google.com> 1575350707 -0800

Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I557701733b49b0f231c89165239ba07c0fa288d2