Merge "Do not mask exceptions from initialization" into main am: 1ce0ccf1ac

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

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