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

Change-Id: I1d13247c9a259a8002369301c0c65e017473e07e