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: 5973dc2a

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



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