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