tree 419867b7fedb2f2f3e1e52f49662b9eed0586126
parent b57b3038522abe652d774d7b7c27efb46082e3f7
parent 391d25e4a27dd73f38a5bc20d96717360e09626f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1575478665 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1575478665 +0000

Merge "Merge Android10 QPR1 into AOSP master" am: 14627b1101 am: 391d25e4a2

Change-Id: I3eca611d50859056abd142c45fca62ab87f8459c