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

Change-Id: Ia8fb43fceea7f13a035a719a969e833b45e99408