Merge "Fix Security issue for Html.fromHtml without escape" into sc-dev am: 535de78aac

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

Change-Id: I5016310f0535848eeab51a9343614e1807b3f048