am cc26e1dc: Merge branch \'lmp-mr1-ub-dev\' of...

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: bcad54f6

* commit 'bcad54f6':