Merge "simpleperf: replace --include-filter with --addr-filter." am: f67298aa2b am: 1338f310e0

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1364056

Change-Id: I226d580f19930752070498158c3b61a3ddc9e52f