am 5a245bdd: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/packages/services/Telephony into lmp-mr1-ub-dev

* commit '5a245bdd6651f186abd0f2dcaf430f6286328819':