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 am: cd840158

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

Change-Id: I4e3e87ef946a1dd8fea41bfad3f61b739b70f460