Merge "Do not hold InstantAppRegistry lock when deleting package"