Merge "Add Compat framework flag to restrict SAF" into rvc-dev am: d43fb2b938

Change-Id: I535096fe7dfc8b95e8124480dcf1159c26535909