Fix isAtLeastS failed on SCV2 and master

Bug: 196388694
Change-Id: Ia86664ee875d428c4b98d48e9aa0218ea4d94009
Test: manual
(cherry picked from commit 3f46e5ff56fc137d087dfcf172f75d5a0f3b3adb)
1 file changed