Merge "Merge "Release mPackages lock earlier am: 94f9be2e am: 2ee7053c" into nyc-dev-plus-aosp am: c4f7166e" into nyc-mr1-dev-plus-aosp