[automerger skipped] Merge changes from topic "expose-call-forward" am:...

[automerger skipped] Merge changes from topic "expose-call-forward" am: f0b822c8 am: 5abd8781 am: ebb53bbb am: b49b3c94 -s ours

am skip reason: Change-Id I14b4d527807e92fe977b8304f8dd95e7cd93e819 with SHA-1 303060c9 is in history

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

Change-Id: Ifa382551feb3f69ab9d914def069a74a18924572