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

Change-Id: I5ad7d63762e03b54eccc404bb7bc7fd87774741f