[automerger skipped] Merge "telephony-stack util API lib" am: 91e1a00846 am: 70ac0bd904
am: 3df1a531dc -s ours
am skip reason: change_id I81a6948246f1453481962699855560c2f64bb413 with SHA1 192bf1f1e3 is in history

Change-Id: I84abd3ee81070d4d9e95b0af6d1e5d4ad46a85d1