[automerger skipped] DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager am: dde6248065
am: 7227ff19aa -s ours
am skip reason: subject contains skip directive

Change-Id: I2a1e528bb5d85b65f15c828da9ac89d7677326e7