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

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

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