tree 91240c54aeeb27b6beba74a667f54dda2907d5a4
parent 2f183eb4362457cf427ce41ed8f1ecb0ba2cf430
parent 4e12559f3b2e4e36c38d85a889a874361a320996
author Xin Li <delphij@google.com> 1575350723 -0800
committer Xin Li <delphij@google.com> 1575350723 -0800

Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I0c8f863c2ad5a8185b020c2b3ec5ec9d0a89a148