[automerger skipped] Merge "Getting rid of Dependency.get" into tm-qpr-dev am:...

[automerger skipped] Merge "Getting rid of Dependency.get" into tm-qpr-dev am: 30263a4b am: e9022a9c -s ours

am skip reason: Merged-In I5cd2435c0608968a2d880d742ebb1a307c48b02b with SHA-1 5ca3f8c3 is already in history

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



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