Merge "Don't assume r.curApp is valid when finalizing broadcasts" into rvc-dev am: 33e8dc79

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

Change-Id: Id17f39477d07dbc3063a516244170dd748b020a7