Merge "init: Fix ramdump when enabling shutdown animations." am: 3b210bc6...

Merge "init: Fix ramdump when enabling shutdown animations." am: 3b210bc6 am: efbba8cf am: e0b9d706

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2613313



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