Merge "Merge "Remove statslog-telephony-java-gen from telephony-common" into...

Merge "Merge "Remove statslog-telephony-java-gen from telephony-common" into tm-dev am: 5141d405 am: 14a8589b am: c1d628ce" into tm-qpr-dev-plus-aosp am: c486db0d

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



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