[automerger skipped] Merge "Remove leading space included in the...

[automerger skipped] Merge "Remove leading space included in the ServiceDescription for ChatBot" am: a74775e5 am: 9275f47c -s ours am: 7a648613 -s ours

am skip reason: Merged-In I5fdc2afee3cc0db457c32ad5698d17b9a520c5f8 with SHA-1 c83668e8 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/1753206

Change-Id: I9c91a78a53c222cbee4527b3c6e7616a93a1d340