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

Change-Id: I696cb8e7bad1dc0570e237babd893809b43da36f