Merge "Remove the icon differentiation which was not a supported feature." into sc-v2-dev am: cab475177d am: b2515722e3

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/16421596

Change-Id: I0a8ab215fd8f7dab29809025347ec55fed500009