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

Change-Id: I75d755c67959ede7c4cfb6dbf940a9ac3737d88b