tree 4dd1aa352b0c17d523461e64886f004d68f5216b
parent f2cde720ac5eaad96d87a70aa4b1ce2e18e81320
parent 3f2ad703f2e2830a108c2b5d94fa010a6ef84358
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1575478666 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1575478666 +0000

Merge "Merge Android10 QPR1 into AOSP master" am: e723bba658 am: 3f2ad703f2

Change-Id: Ia324d78f1ecbe1116fb668eb56a5d74ee8f0aa1e