tree fd363aec6d806243669e24edb6b5c2c8e3c82903
parent 4e6ea23e23ea902ffae2b438cf7418be7da236b6
parent 62645b0659e37d0bb4ddbbdcdf129a930c006675
author Xin Li <delphij@google.com> 1575350710 -0800
committer Xin Li <delphij@google.com> 1575350710 -0800

Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: Ia0a181c328abc9bfb7c972a55e8cdaa7387846c7