Merge "Add test for NetworkStackUtils.attachRaFilter" am: 0be71afff0 am: d0f401e44b

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

Change-Id: Ia4cb4c4c3c9f93cb6c898aa6467aa85155b2c4e2