[automerger skipped] Separate proto message definitions for pushed and pulled...

[automerger skipped] Separate proto message definitions for pushed and pulled atoms am: 9bf5712f am: aaeb344c am: 3c13080e -s ours

am skip reason: Change-Id I1e65b3c6f9c38e279a37a87ed47c5dbd6ae65fb3 with SHA-1 c57a6a3b is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1544674

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife715aa152bed0bc6a556306bfd4cd36d29bb911