Merge "CachedAppOptimizer: Remove PAGE_MASK usage" into main am: 3b35e9d4c8 am: fd825692c8 am: cfcbf5d8b7 am: 023b9ba396 am: 13a09104a8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2714676

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