Merge "Fix import orders" am: b314aab105 am: e8b79dd866

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

Change-Id: I7056b9bca99baf999c7ded7c2b12904aa53dabaf