[automerger skipped] Merge "Modify the TelecomLoaderService to provide LocalServices to Telecom" am: 5c17953fb7 am: 8f430654a3 am: cf81701713 -s ours
am skip reason: Change-Id I3d71331cbc8f01f764cc0b9704416821007feeb5 with SHA-1 4cead2c3e8 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470697
Change-Id: I71db329e51eb56c14b3e3a38e6a4399ea6fbf8f2
This commit is contained in: