Merge "Instrument SDK level and change IDs to help testing" am: 5cc9676d4c

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

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