Merge "Modify the TelecomLoaderService to provide LocalServices to Telecom" am: 5c17953fb7 am: 8f430654a3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470697

Change-Id: Iff4f12399d3eac669dbe29e183fb3348f0e7b68b