Merge "Merge "More robust restorecon and additional debug info." into tm-dev...

Merge "Merge "More robust restorecon and additional debug info." into tm-dev am: 8169e839" into tm-mainline-prod am: 5740fe41

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



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