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

Change-Id: Iaa52d4cb4ba713ae9a9a2a65725cf0fa663e950f