[automerger skipped] Add support for integrating call composer am: a749abcead am: 1138d7c103 -s ours
am skip reason: Change-Id I602b51da6009c884364a026781ca3c160978fbd1 with SHA-1 2d1bc540e4 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13429553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I10d6410a66ea07c07e20b4120ed640760bcece8b
This commit is contained in: