Merge "Release mPackages lock earlier am: 94f9be2ee2 am: 2ee7053cfc am: 893fbf87dc" into nyc-mr1-dev-plus-aosp