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

Merge "Avoid two SELinux related error messages at boot time" into main am: 87d6c8a1 am: 5236858b am: db34b3e5 am: 212f1f06

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



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