[automerger skipped] Merge "Ready more build rules for dir move" into udc-dev...

[automerger skipped] Merge "Ready more build rules for dir move" into udc-dev am: 9d7cd379 -s ours

am skip reason: Merged-In Ib2776dfc6c67b2042fb2f43a1251cd6f0ba61dc7 with SHA-1 ca6e67a6 is already in history

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



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