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

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

Change-Id: Iea354edbe512147de8b375d16403845a2e7a7514