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

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

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