Merge "Do not call updateApplicationInfo with mResourceManager lock" into oc-dev