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

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

Change-Id: Ib3c51d9554f836d8a0b491522887e44b91756d6b