Fix more sonars in pap

Fix more sonars in pap

Somehow missed this sonar on one line of code:
- remove useless assignments

Apparently, sonar only complains about some useless assignments (perhaps
those that do more than copy a constant).  Fixed one about which it did
not complain, which appeared immediately before the one about which it
DID complain.

At one point, sonar complained about creating ArrayLists without
specifying the initial size (when it was known).  It didn't complain
about this one, but went ahead and fixed it anyway.

Issue-ID: POLICY-2679
Change-Id: I270341195634416db1f8152a95a5822c8d505803
Signed-off-by: Jim Hahn <jrh3@att.com>