[automerger skipped] Bold StyleSpan further for auto-bold am: 1a5de0a925 am: c7713feafa -s ours

am skip reason: Merged-In Iec7db7eadd18ed6a2efc6ee39b49c1d6cb15d870 with SHA-1 0a674a8a44 is already in history

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

Change-Id: I623b84eb72cb4a82749874de420277ffb01531f2