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