Merge "Merge "Include data scheme when registering for package_* broadcasts."...
Merge "Merge "Include data scheme when registering for package_* broadcasts." into rvc-dev am: 606626e0 am: 3641d900" into rvc-d1-dev-plus-aosp am: abd7d415
Change-Id: I467375e1b036d8f31f76c4820a0e232537bd510c