tree 57087bdf0bf59046a0b3e2489a52dd2277e27860
parent 0888032b1c566b4d5713631b667c54cae33ff4a3
parent 944b8b330fc4da999f69b3293284a14d2aa15ff5
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1575478662 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1575478662 +0000

Merge "Merge Android10 QPR1 into AOSP master" am: bd2174cda1 am: 944b8b330f

Change-Id: I8cd38765099d4e81689293ab48975e0be8f6ac3e