[automerger skipped] Merge "Merge "Fail if there are repeated fields in...

[automerger skipped] Merge "Merge "Fail if there are repeated fields in atoms.proto" into rvc-dev am: 19282c39 am: 40255f08" into rvc-d1-dev-plus-aosp am: 6aaf82fe -s ours
am skip reason: Change-Id I0caa6fcf74dabe8e962360ecccfd3a87fcaa4909 with SHA-1 c88fbf1e is in history

Change-Id: I055371da8d0f2accd2b0bd0501f84b316dee7fde