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