[automerger skipped] telephony-stack util API lib am: 09ae9e8e am: ca8c3d29
am: 61deefba -s ours
am skip reason: change_id Ibeca143f472d46b9ebd545d04bb6b8bae984cfbc with SHA1 efbaa09a is in history
Change-Id: I8ba99f892924733ed79ea1ed07ce5f22b19a2fe4