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

Change-Id: Id3f8518db5a906aeb626494309c7bb70fdf57d24