Merge \"Fix bug with launching home activity from LockSettingsService\" into nyc-mr1-dev
am: 49fd320574

Change-Id: Id050bad455a77ecc6523e8f0d5363668677f6945