Merge "Fix issue with late binding to ICS." into udc-dev am: 7ecba734

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



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