[automerger skipped] Replace FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT in Connectivity am: bee1c6d9cd am: a73afb9790 -s ours am: 23f47f35dc -s ours

am skip reason: Merged-In I2f155592b08cdbf259a00b035cacb37ca9847e72 with SHA-1 e0f3796bbb is already in history

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

Change-Id: I9187d193aaaa79ea955a2c8a607fadda1a113793