Merge changes from topic "expose-call-forward" am: f0b822c8bb am: 5abd8781fd

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

Change-Id: If5d2a4c5eaa6edead7e036f1740d0fcc752010b5