Merge changes from topic "mmtel_capability" am: 4b07c1b401

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

Change-Id: Ie0723975ddc1b92939b3981996456a8e07b1c401