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: f8c126c5

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

Change-Id: I4854e54cfde40c6f50a27e8d481c7e025d692b5f