Merge "add a property for controlling perf_event_paranoid am: fe01f56c0d am: 12d2422ef0" into nyc-mr1-dev-plus-aosp