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: 11d90cda am: c5d1cc7b

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



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