DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager
am: dde6248065

Change-Id: Ic452fed2390fab0f69799a192ce86402b4c0cb7e