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

Merge "Restore removed block to create dependencies" into udc-dev am: d2a94221 am: b188cdb4 am: 2f585c5e

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



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