Merge "Fix AOSP boot animation black screen issue." into sc-qpr1-dev am: 6d673f1f am: e277f0de

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

Change-Id: Ifd2e5955fd9d4b2c790db69d36840c8b52cb8f95