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

Merge "Merge "Revert "SELinux labels bug logging and workaround"" into tm-dev am: 1133947c am: 5973dc2a" into tm-d1-dev-plus-aosp am: d65031d7

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



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