Merge "Revert "SELinux labels bug logging and workaround"" into tm-dev am: 1133947cd1 am: ecaa9ba814 am: cdc301cbc8

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

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