Merge changes from topic "increment-crash" into tm-dev am: 2a21ffa679 am: fcb631aec5

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

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