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

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

Change-Id: I249cf2be69098b4bcf6bd1f98c13a098f58a5f2e