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

Change-Id: I19e1d7539e4cbd4f47b06f37709c58b58d375f19