Merge "Remove contents of DependencyProvider." into tm-dev am: 24310743eb

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

Change-Id: Iebd0217d37d95bf9b0b6d1726bba2a006840302e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>