Merge "Merge "Explain the difference between setBreakStragegy() and...

Merge "Merge "Explain the difference between setBreakStragegy() and setLineBreakStyle() in API doc" into tm-dev am: 2b868683 am: 4e9b6a38" into tm-d1-dev-plus-aosp am: 68316183

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



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