[automerger skipped] Merge "Add a .pbtxt to .pb auto converter" into rvc-dev am: 83c945db -s ours
am skip reason: Change-Id I45723669f82aa2f3a9a4eed0f566e1d81963d001 with SHA-1 1ba6afa3 is in history
Change-Id: If26a0d884b31e038c9fc3a1633f989778744d23a