Merge "Fix import orders" am: b314aab105

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

Change-Id: Iebe8b5da2dfeaedd0d26fea208c07a9507713f91