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

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

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

Change-Id: Ie64cd2be8fb4a76bcef08eca72e5940c43868af4