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

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

Change-Id: Icb38e71a17f5b143545622411a690ff8b2985638