Merge "Set sharedUserId="android.uid.system" to use protected broadcast" am: e2920891c1
am: 09a7cc5318

Change-Id: I0ddf41fbdf44f630525a3eb5916073546fc9700c