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

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



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