Merge "Fix Security issue for Html.fromHtml without escape" into sc-dev am: 535de78a am: 20f9cc35 am: e551d240

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

Change-Id: Ib74aab0cd555ee18925556a56b993a3afdd79c13