Merge "Moved modules into new data package" am: eb5a6d7295

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2018600

Change-Id: I25b21ca7c88c3e3daecf5a6a30fdea9924ed89e1