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