Merge "Fix import orders" am: b314aab105 am: e8b79dd866 am: e9c8c933d7 am: 2356028c58

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

Change-Id: Ia6debe70ff06f7942e00b4f03d43eac73ca34688