Merge "Fix bug in device path proto reading" into main am: b63973dfc2

Original change: https://android-review.googlesource.com/c/platform/build/+/3085527

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