[automerger skipped] DO NOT MERGE DeviceConfig: Add Name space and keys for...
[automerger skipped] DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager am: dde62480
am: 7227ff19 -s ours
am skip reason: subject contains skip directive
Change-Id: I2a1e528bb5d85b65f15c828da9ac89d7677326e7