[automerger skipped] Separate device config from teeui rendering test am: d8ec1fe1ae am: 9b8d7ce9c2 am: 9da8352bbc -s ours
am skip reason: Change-Id If57c1bf9e7ea25c81f755b7e6df78ba0e6e52313 with SHA-1 42475294a0 is in history

Change-Id: I6d8eaa2effe51413a06cb13ef19880490756089f