Merge "Revert "Report permission flags for all protections based on SDK" am: 784b56e1 am: 076d6f76" into oc-dr1-dev-plus-aosp