aml_adb_331610000 (9572830,com.google.android.adbd)
Merge "remove @Feature usages" am: fa222a901a

Original change: https://android-review.googlesource.com/c/platform/external/cronet/+/2419286

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