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: def8dbfe" into rvc-d1-dev-plus-aosp am: 20c2b467 am: 7a37a4cb

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

Change-Id: I053671d9810c3e70b6f643c92efcf552cb554b15