tree 12a14e7618f3dc71ef31e41921743e266b28f0d4
parent a29a64c17ee15f46bdc0e3141929c55511633ff7
parent ef8b74b2307fea4c68b0def2be329d8cac4b7a5f
author Steven Thomas <steventhomas@google.com> 1585766782 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585766782 +0000

Merge changes from topic "revert-10403399-pkg-override-label-icon-DCRMJNYAKW" into rvc-dev am: b69f2bc126 am: ef8b74b230

Change-Id: I0e06df34c6aaa65e591d384fb7945cebdefbe872