[automerger skipped] Merge "Remove StkLib from telephony apex." am: 54be8a4b81 am: 4448aa6cdb -s ours am: af96735c1e -s ours am: 429cca489c -s ours
am skip reason: Change-Id I07f15ec63356a8f4342bf0775c6caad061e7f848 with SHA-1 d9e9b653eb is in history

Change-Id: I921e4b74e16c7f8c7468fb84bd1a889ce761da83