Merge "Refactory the feature flag for ra lifetime filtering" into main am: 7e303a187d am: 3050c66867

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/2829431

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