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

This reverts commit 475c19532d1f06185b63a0708cf0164a0d6f3feb.

Change-Id: Idb9a91eaab36d28e6ed3f3b4c55f1e7d44f1d3ad
3 files changed