Merge "Fix fingerprint failing to start on GSI images" am: e0526e27e9 am: 381ed1c8f2

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/2061687

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