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