[automerger skipped] [DO NOT MERGE] Fixes boot issues on Headless (HSUM)...

[automerger skipped] [DO NOT MERGE] Fixes boot issues on Headless (HSUM) related to ag/25382994 am: f9571f82 -s ours

am skip reason: contains skip directive

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



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