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

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

Change-Id: I907b3e775ddcd01ecac0283036a5241c3d1c8a57