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

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

Change-Id: I8fdb6b92abe0d42cd9e409b36c000b25a3bd8163