Merge "Merge "Don't assume r.curApp is valid when finalizing broadcasts" into...

Merge "Merge "Don't assume r.curApp is valid when finalizing broadcasts" into rvc-dev am: 33e8dc79 am: b3f96855 am: ee77a1bd" into rvc-qpr-dev-plus-aosp am: 4b5f1dde

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

Change-Id: I74075a40d616bd2d400b9c28a3f268574a1c8377