Merge "Fix call to ImsManager#getInstance am: b574d5f303 am: 995b0684ea" into qt-qpr1-dev-plus-aosp
am: 878e460534

Change-Id: I2114f03fe0749d8d17c7476afda7a638c051c436