Merge "Update IntentFilterTest to account for protected-broadcast" into rvc-dev