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

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



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