Merge "Restore removed block to create dependencies" into udc-dev am: d2a94221 am: 34810981

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



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