Merge "Fixes boot animation not appearing issue on Oriole." into sc-qpr1-dev am: 3a986bb956 am: cd852327b1

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

Change-Id: I335d5096b91a9cbe3e61bd8c73e5a3d078bb76e9