Merge changes from topic "mmtel_capability" am: 4b07c1b401 am: 6ab83e6216

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

Change-Id: I6dda7fbe2b65fb468cc90aceafc71a0d766c25b3