[automerger skipped] Implement proper subtype advertising am: e6e3e2b120 -s ours

am skip reason: Merged-In I09e780af25149162f16bd75410ddc50f160a0dab with SHA-1 ce44beb7aa is already in history

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

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