Merge "Fix test failure." am: 37ccb7cece am: 886387532a am: 714e4d34db am: a6c1be8445

Original change: https://android-review.googlesource.com/c/platform/packages/apps/ImsServiceEntitlement/+/2034296

Change-Id: I578295d13cc38546caf7ec76d6aaf86efdc9fd0c