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

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

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