[automerger skipped] Ready more build rules for dir move am: a5d4de95 -s...

[automerger skipped] Ready more build rules for dir move am: a5d4de95 -s ours am: 179d02d9 -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: I6e58d4785791899eda5535a10ae10ecb8365e797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>