[automerger skipped] Merge "[TNU1.2] Add string for client number...

[automerger skipped] Merge "[TNU1.2] Add string for client number notification" into rvc-dev am: 975130e0 am: e0d01b91 am: 477640f8 am: c04350c8 -s ours am: 56bbff30 -s ours

am skip reason: Change-Id Icc4e59ce3b2d8d4c1c7883c2f9d040d3ce563f09 with SHA-1 fb99716c is in history

Change-Id: I1ff7c5b4854203c375f5e98ce31fb803249083dc