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: 5f0201d7 am: 605e0fcf

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

Change-Id: Ie0b7009c78480f6efa45a0bece3e79ed052d5f6e