[automerger] Fix Buffer Overflow in Vendor Service display.qservice am: e10b84c30c am: ad1d6cec09 am: 2ba224564b am: 98a3c765db
am: 37851e41a7

Change-Id: I31b56cb4bb5f3fd5d658796170023726adf13ece