Merge "Merge "Revert "always adjust per-user application info"" into oc-dev am: 887544e100" into oc-dev-plus-aosp
am: c2bc1f2790

Change-Id: I8cc5adb9382909d5f149dfdb5ce760e1e9a29d96