Merge "Don't call into pkg mgr svc w/ lock held" into nyc-mr1-dev am: 0060d6eda1
am: 5cc6bf0ead

Change-Id: If8de2f5e7751ec1e65b7bdb499ecde0037fbec9b