Merge "Remove --show-annotation FlaggedApi from flagged-apis-droidstubs" into main am: d3d41ac7a4

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

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