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

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



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