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: I61142cbc6810c9d3b8d9f6b0b1ccfb96ee004514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>