Merge "ashmem: Allow for restricting mapping permissions multiple times" into...

Merge "ashmem: Allow for restricting mapping permissions multiple times" into main am: 20f62340 am: 57c9d3b1

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



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