Merge "Avoid two SELinux related error messages at boot time" into main am: 87d6c8a1

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



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