Merge "Append root cause with error message while parsing APEX" am: 411f31c83b am: 227d69ec89 am: 4825a02c11

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

Change-Id: Ie2e7e96cd6afa49f16a9556bf43650208911a54a