Remove duplicate code and add fn for flag check

Test: atest CtsKeystoreTestCases
Change-Id: I47975e028896ebe5777bae8efe8b17507bb36500
1 file changed