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

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

Change-Id: I77b788dea2058df0109ee9e38c924416bf230500