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

* commit '1181c28eb79d8b0cbe84078996ad73fd187b0dd0':