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

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



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