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

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

Change-Id: I95b126994fb7547632950bfd6e485e781abc085f