am cc26e1dc: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev
automerge: bcad54f

* commit 'bcad54f6474b264a04a4f59fb8ad6371861f1a62':