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

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



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