Merge "change ownership of for-system subdirs to AID_CLAT" into main am: e9560e72d2 am: 746f715d6d

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

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