Merge "Merge "Fix typo in android.telecom.Connection." am: c8b5936fea am: f2ff682b07" into tm-qpr-dev-plus-aosp am: 942bc62c4f am: 510521083c am: ff1c12b1b7

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

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