Merge "dumpstate: Add radio/sim folder to bugreport" into udc-dev am: 9626187645

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/22132863

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