Merge "Bind provider services when necessary" into sc-dev am: a00481f6 am: 73507e62 am: 00a54850

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

Change-Id: Ic60923a49931259f8d48c1e371e209257e71d15c