Merge "Do not draw icon background if it shouldn't be seen" into sc-dev am:...

Merge "Do not draw icon background if it shouldn't be seen" into sc-dev am: ee08a68f am: 44823207

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15175437

Change-Id: Ib5681a1e9028e5ecea42a3dbf92658e230b8b0f1