[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 am: 947c5251 -s ours

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

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



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