Merge "Fixing split shade going full black when changing density" into sc-v2-dev am: cdb9fa739f

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

Change-Id: I654080baf8a39a511fb2d8e9d7de7d4718235980