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

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

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



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