Merge "keymaster: Remove usage of PAGE_SIZE" into main am: 99414ad0 am:...

Merge "keymaster: Remove usage of PAGE_SIZE" into main am: 99414ad0 am: 557d5dc8 am: d9d59f85 am: f64d50cb am: c5c09af5

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2695354



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