tree 270adef92e44570263e1cba449be6fea18cbfbb5
parent 45a8e4ece2080c87c2509446a96526373a306f9b
parent 2150129aba45306e8414fbd1088086bc5ced1691
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: 4848226fab am: 2150129aba

Change-Id: Ic44693dc150c2a85a7a5b1902ac2ce8916fabdc2