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: Ib43d9b659b0b299c691b452654ac3db9656fc6a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>