Merge "Fix Security issue for Html.fromHtml without escape" into sc-dev am: 535de78a am: 4fb82478 am: 0c99e3db

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

Change-Id: Ic74f5bc108026202fb0121db7aa03c778a20a08e