Merge "Move ApplicationPackageManager out of ContextImpl.java"