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

Change-Id: I236002d9f9d743775b6d4732e87417ceca6aac85