Merge "Merge "Improve exception logging for system backup/restore" into sc-dev...

Merge "Merge "Improve exception logging for system backup/restore" into sc-dev am: 8f589c02 am: 2fbaf455" into sc-v2-dev-plus-aosp am: c7a2f8ae

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

Change-Id: I3cec23a711b360ed51cf773951f7fb8700a3859e