Merge "Collect diagnostics without storage permission" into main am: 899737e0e0

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

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