Refactor SystemPropPoker

Bug: 62442606
Test: SystemPropPokerTest
Change-Id: I67d6e16ec4d637d94b3adcf240ea6b5a45438ad9
2 files changed