Merge "Drop TODO for flag enablement" into main am: fdca8e2055 am: 5a089ad035

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

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