Merge "init.rc: add a new maps dir under /metadata/aconfig dir" into main am:...

Merge "init.rc: add a new maps dir under /metadata/aconfig dir" into main am: cc6eaae7 am: 1e3a25ca

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



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