[piav2] Code cleanup

Rearranged code and renamed variables to increase code quality

Bug: 182205982
Test: Builds
Flag: android.content.pm.use_pia_v2

Change-Id: I65b9a5c2a04f7fc16bfbcc4a6c7fab575927678a
5 files changed