Minor post-merge cleanup.

Change-Id: Ic65ef882b61aa6506d21bbe41b9ac8473a950591
Treat default value that wasn't found as empty value.

Fixes http://code.google.com/p/android/issues/detail?id=33220

Change-Id: If22e8b245f688d922c168aa54c8acf743c0644d7
Dialer AutoComplete: Bootstrap the onUpgrade for the SettingsProvider
to automagically create this setting and enable it by default.

PS2: Delete evil whitespace
PS3: Forgot to update the DB Version

Change-Id: I58eee488d1dee4941713d5cc4503f2f2861462d5
StorageManager: fix android.process.media process stop while plug a discontinuous partitioned SD Card

While get volume state, throw an IllegalArgumentException, catch
this exception in StorageManager and return null to MtpService to
avoid process stoping.

Change-Id: Iebb5c38e375d3f54505d9b9d64fcd0f02a2b60c1
Author: Li Gang <gang.g.li@intel.com>
Signed-off-by: Li Gang <gang.g.li@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 47459