Merge "Update Compat Framework so all system uid apps are treated as targeting current sdk" into main