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

Change-Id: I4a23157ca9ee2f3279c83eb8cf94144ab18d20ea