[automerger skipped] Sandbox DumpstateServerProtoStub_cc/h am: 349f8fc61d -s ours

am skip reason: skipped by user colefaust

Original change: https://partner-android-review.googlesource.com/c/device/google/trout/+/2677252

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