[automerger skipped] Clear calling identity before accessing DeviceConfig am: d65aa4ba26 -s ours am: 40f3e64cd7 -s ours

am skip reason: Merged-In Icb4721ce8ca9c8fc7e9118b4e46300147be4e08e with SHA-1 afda1a5579 is already in history

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

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