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

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

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