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

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

Change-Id: Id43c5108d21feeb6a0e566b40fbd29dd7faee8c4