Merge "simpleperf: Remove PAGE_MASK usage" into main am: 8cf8a27b69 am: 23e1c0eca7

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

Change-Id: Ic347952fa32ccf67b8349bd75d08d7cfccf7cf9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>