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

Change-Id: I9f23e2ed2ca13f33a2ad35a8f7b98b6172d33e3d