Merge changes from topic "memcg_v2_soong_flags" into main am: 6d6ff398 am: bf598a3b

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



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