Merge "[aapt2] Pseudolocalize <plurals> values." am: a5e26c955b
am: 735aaa630c

Change-Id: Id1b6e3f5b28f86e73a74edf2428784aaba472ee3