Android CTS 8.0 Release 24 (6676658)
[BACKPORT] res_create_query: avoid single-byte buffer overwrite am: f4baf84f28 am: 6ec5e7a803 am: 178523dfa9
am: 211489aeae

Change-Id: Iec6190334b446971ac7d109bc33dc853c4c3d32a