Merge "Don't hold the CPH lock while installing providers." into sc-dev am: 4e974ce20d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14162426

Change-Id: I30909771c1a2bc38851769fcf0d677596f98b18b