tree d1b03d0ce81859fcad422eb177f0b51842e2f63d
parent a952c709f39ee94f895ec854b8d7be35acc0a59d
parent 8f48cb8c4ddf6f411bc5ad09ab6f9fcd18e1db48
author Xin Li <delphij@google.com> 1575417138 -0800
committer Xin Li <delphij@google.com> 1575417138 -0800

Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I8cb964fe1b4999d8e568284a68c461c1f8c094ab