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

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

Change-Id: I12392eee398fef6be867a10cf6d627a1c4b3eea8