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: 6ff694f3 am: 3dbe7f0f" into tm-qpr-dev-plus-aosp am: a993daec

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



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