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

Change-Id: I0a63bdd6e19253a87a439301f05d0116049bcdcd