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

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



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