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

Change-Id: I0b0b0e5b8d12511b8bcd9d40a2e725b0930c99bd