Merge "Merge "Fix typo in android.telecom.Connection." am: c8b5936f am:...

Merge "Merge "Fix typo in android.telecom.Connection." am: c8b5936f am: f2ff682b" into tm-qpr-dev-plus-aosp am: 942bc62c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2481490



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