[automerger skipped] [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 am: 927b3357fa am: 79d0fb2530 am: a509e771ba am: 80e36faa72 am: 76d71fa910 am: 86cfcaa610 am: 4f5e234020 am: 5604680766  -s ours am: 19c4ef269f  -s ours
am: 3ec1692a65  -s ours

Change-Id: Ieabcffdd4bd5ea09941232f28be6d08532f4727e