Merge "Make sure symlinks created by ueventd are correctly labeled" into main am: eeef98a296 am: 78732cde4e

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

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