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

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

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



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