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

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

Change-Id: Iaf9a8009a6fcd71cacf20b6fb781e586e62b6004