Merge "Fix Security issue for Html.fromHtml without escape" into sc-dev am: 535de78aac am: 20f9cc3573 am: f45f60d56f am: b3b75a23a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15560908 Change-Id: Id5336c5710d63e5e98f3375e190ea8f709f862d0
This commit is contained in: