Merge "bootanimation: add empty lines parsing skip for desc.txt" am: 936f661025 am: ac614b3da5

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

Change-Id: I8cd966f9b020a3b691a21dcb66ca9fc7c63831af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>