Settings: Added choice of 45 seconds for screen timeout, lock screen and dream.

Change-Id: I58cb14776fe9d447b79faf810d7f6142bc058341
Settings: fix NPE with null check on NFC adapter

Verifies the adapter is not null before dereferencing it and log and error if so

Change-Id: Id2a34c4698a97476bee9b78cb0ac7b980d1595cf
Fix elapsed time formatting.

We should extend DateUtils to provide this kind of elapsed time
formatting via icu4c, but for now let's at least fix our
arithmetic.

Bug: https://code.google.com/p/android/issues/detail?id=61479
Change-Id: I6c087dbb9fdbff0a21d9243d239126fee180454c
Bluetooth: Set alias name only through Rename option

Set the alias name only when user is trying to change the
name using the Rename option of paired device.

CRs-Fixed: 539420
Change-Id: I415b6a962d8e7884b67d37b94c04df19e2c23012
Fix null pointer exceptions in NetworkPolicyEditor

This upload fixes a null pointer exception issue.
After this fix the modified methods return
their corresponding default values instead of null.

Change-Id: Idb94f8b808b8dd18be5e3fc92cc5560ce0f81c4f
Settings : Update gesture preference check

Move the gesture outside the stylus dependency check and remove the
preference category if no children are found

Change-Id: I05ecf71dc84f5244200e3030b5ee524944339145
(cherry picked from commit f6a43a4bc50f6fba64f55c08adff16f8bdcb1c44)