Merge "[automerger skipped] Merge "DO NOT MERGE: CTS: Created ResStringPool security tests" into marshmallow-cts-dev am: 8dc7e9b69f  -s ours" into nougat-cts-dev