Merge "Use invalid package names for special keys in AccountManager." into oc-dev
am: e669ae438f

Change-Id: I41c726829585b3628125b17548428b3cc4f3a06e