[automerger skipped] Merge "[DO NOT MERGE] Fixes boot issues on Headless...

[automerger skipped] Merge "[DO NOT MERGE] Fixes boot issues on Headless (HSUM) related to ag/25382994" into udc-qpr-dev am: 3bf69d45 -s ours

am skip reason: contains skip directive

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



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