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

Change-Id: I092d3c995ee232fe5ff233dce1ae56f76dfcd62b