Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-dr-dev-plus-aosp
am: ead9448b
* commit 'ead9448b':
Always show pairing dialog for device-specific keyboard.