Merge "Fix NullPointerException in the android.telephony.ims.cts.EabControllerTest" am: 4ce6c6a010

Original change: https://android-review.googlesource.com/c/platform/cts/+/1652628

Change-Id: I349c9c3a71192e5b8202a6880803b51f9fa0f710