[automerger skipped] Merge "Moved modules into new data package" am: eb5a6d7295 am: a6c3d2ebbf am: 52af2b2d0e -s ours

am skip reason: Merged-In I520e0fa3d1d1a5020de26862beb66b1bf636559d with SHA-1 cfc3ac61d0 is already in history

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

Change-Id: I5586f26896b6aeae321e07ac87e5fe217b1b3c85