[automerger skipped] Merge "Move telephony framework sources as part of...
[automerger skipped] Merge "Move telephony framework sources as part of non-update framework." into rvc-dev am: d961f717 am: f3242dbd -s ours
am skip reason: Change-Id I7ad2eefa854da00845d1d5c2fea596628f092e92 with SHA-1 c7991809 is in history
Change-Id: I3cab359251f93e2ef790a4c336df16cc622a13ac