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

Change-Id: I7c5334f8f5edec26d5c7c67e391a23c57d81b202