Merge "Fixed issue where layers were not always used" into sc-dev am:...

Merge "Fixed issue where layers were not always used" into sc-dev am: 0b7205bf am: 7cfaa715 am: 0e0f8232

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

Change-Id: Ic810e99565bc2236283f94efa4d9dffcd07b2dee