Merge "Bind provider services when necessary" into sc-dev am: a00481f6 am: 5509e63e am: 50b18e9c

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

Change-Id: Ie88865ca2d8573398cf0c8a391ef8370f51435b6