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

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

Change-Id: I596d07dc136920315f57c26229668cdfef4d5f2c