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

Merge "Explain the difference between setBreakStragegy() and setLineBreakStyle() in API doc" into tm-dev am: 2b868683 am: 4e9b6a38 am: e0d6f903 am: 3c7b2c3f

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



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