[automerger skipped] Merge changes from topic "expose-call-forward" am: f0b822c8bb am: 5abd8781fd am: ebb53bbb2b am: b49b3c9484 -s ours
am skip reason: Change-Id I14b4d527807e92fe977b8304f8dd95e7cd93e819 with SHA-1 303060c932 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471163
Change-Id: Ifa382551feb3f69ab9d914def069a74a18924572
This commit is contained in: