[automerger skipped] Merge "Shorten the name for the dump file." am: a7542972 am: 3935ac08 am: d802f489 -s ours

am skip reason: skip tag Change-Id Ic0f87b97bb58e115fe81e2d688ce0e633397da42 with SHA-1 2b573516 is already in history

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

Change-Id: Ie3c654e53d42ac4de12aed66aa7ec74373e2c929