[automerger skipped] Merge "Fix issue with late binding to ICS." into tm-qpr-dev am: 26d3417b4f -s ours am: dfad8210f4 -s ours

am skip reason: Merged-In I8783b2ce5be4af9e24d6ffa4bca81b23a64e0700 with SHA-1 63a5768e30 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/23263658

Change-Id: I90813129e1038669c7786aa3413b05c9fcd3b763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>