tree 83b8ccecc3e5629f5d35bb03817df4950fad55bc
parent 6da0ed9d0303599daafd6fc894865faba9bdb5e3
parent fd99009c529d5ee7734997f2dfecb486a4b5df22
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583192765 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583192765 +0000

Revert part of 79eb7ba87bedd88fffa62a13ea9399c2affa1573 am: fd99009c52

Change-Id: I764110dd3cacb3c2953afd38983b6f43b83811a2