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

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



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