Merge changes from topic "expose-call-forward" am: 666b6eeb2e am: df399f9ac6

Original change: https://android-review.googlesource.com/c/platform/cts/+/1471143

Change-Id: I06513db8d08f75551edb9c8c38d679edb096226f