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 am: a8b23f8c

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



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