[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: 66e9298a am: 8da46300
am: cacba7e6 -s ours
am skip reason: subject contains skip directive
Change-Id: I90a86c3a374c2ad8d5c127361a1962aea70843b0