tree a1a981f65c0ac1744f46c2f05f7777419127a86e
parent c7d9fcd0e0d6351286ef1fe5e84e4b2b3203e7e7
parent 4dff540d8c8d440a69da4576c9d391517fa8cabb
author Xin Li <delphij@google.com> 1575475987 -0800
committer android-build-merger <android-build-merger@google.com> 1575475987 -0800

Merge "Merge Android10 QPR1 into AOSP master" am: 361d6da737
am: 4dff540d8c

Change-Id: I96154b82f23fa6fa13a8cccf1f4ff3a6b0d64911