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

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



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