Merge "[automerger skipped] DO NOT MERGE Allow for HTML styling in mobile data type content descriptions am: a3b5dd1b89 am: 2f373bfb5f -s ours am skip reason: change_id Idf387111b0cdc34ad3762eac0ec6c2b484b393e3 with SHA1 83c87e50b1 is in history" into qt-qpr1-dev-plus-aosp