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