Revert "Update APIs for the flag changes in SAF."

This reverts commit e7decfb815342dbea00b305a52b1178e2d646df1.

Change-Id: I023989381ffa7296db7a21ec01327a32b3f16c4f
3 files changed