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: 437911a3 am: 443a2a6f am: d03f742b

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



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