Fix shape icon and name mismatch problem

Updated the analysis to b/157535141.
Root cause: the gms app updated to use a BitmapDrawable icon which was filtered out to in the shape app list, but its name was still in the name list.
Fix: let's also filter out the app name from list

Test: Manually
Fixes: 157535141
Change-Id: I76ee3fb91d153cd6d1ded19496d1fabd6a1d73ba