Merge "Allow dump modem log on user build" into udc-dev am: e091d0258e am: 5723261ad0

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

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