[automerger skipped] Merge "Always set the top roundness of child rows to 0."...

[automerger skipped] Merge "Always set the top roundness of child rows to 0." into tm-d1-dev am: b86b7182 -s ours am: 52fc08f7 -s ours am: 9acb2f0b -s ours

am skip reason: Merged-In I3cd1aa23ad8333f35ec837edd39bc12aeb1573b6 with SHA-1 ef4782f5 is already in history

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



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