Merge "Fixes boot animation not appearing issue on Oriole." into sc-qpr1-dev...

Merge "Fixes boot animation not appearing issue on Oriole." into sc-qpr1-dev am: 3a986bb9 am: 580ae422 am: 8dbf2472

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

Change-Id: I4501403e20e0a3b50af1629a3d01b8a20d0cefaa