tree 965919e3f9a53bafb3a0aca479fa163f5441a38a
parent 9c2c1b4784bbd76b81f9f1497c88fe5394113e44
parent 944689abd664d2567b1186424fb7f1bc150b1705
author Xin Li <delphij@google.com> 1575350719 -0800
committer Xin Li <delphij@google.com> 1575350719 -0800

Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I4a45c18c3ee945f3603921c60d0762e44e686688