Merge "Ready more build rules for dir move" into udc-dev am: 9d7cd379

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



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