tree 22c56c00bb0175f63d1dafee59dcd19389fe42f2
parent 8021732ca7273e9b0c157f6bf4a92d1ea78a68bc
parent 5cc9ace295921560e6dd2183472d2347f68509f8
author Xin Li <delphij@google.com> 1575350717 -0800
committer Xin Li <delphij@google.com> 1575350717 -0800

Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I3c118d4decc3c7b8801428a172e9dfc4a931f051