Merge "Fix DevSdkIgnoreRule target SDK annotation processing." am: 0588df74e1

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2121219

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