Merge "Revert "SELinux labels bug logging and workaround"" into tm-dev am:...

Merge "Revert "SELinux labels bug logging and workaround"" into tm-dev am: 1133947c am: ecaa9ba8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18699985



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