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

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

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