Moving KeyChain from keychain uid to system uid

Now that the system user can read values from keystore, the keychain user is unneeded.

Bug: 4970237
Change-Id: I5b998ce29c2b32d8014c9ec1814c1e0837951cb5
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0fa724d..1c0b5c5 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.android.keychain"
-          android:sharedUserId="android.uid.keychain"
-          android:sharedUserLabel="@string/keychainUserLabel"
+          android:sharedUserId="android.uid.system"
           >
     <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>