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

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

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



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