Merge "Propagate error while scanning apk-in-apex to session object" into sc-dev am: 929235fb

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

Change-Id: I7e5a73caf0414abc3273016016f8db54b8dac921