tree 43081b204ad4a95793c071ab7c954725975d3cd7
parent 30ce86edf0015c61799bfc43e8fdf1a3993e1f72
author Nicholas Sauer <nicksauer@google.com> 1464207452 -0700
committer The Android Automerger <android-build@google.com> 1464226275 -0700

Fix DisplayTest.

Ensure screen is on and keyguard is dismissed

bug: 28936988
Change-Id: I3da923e394141de54f0ad409edbf2c79af0d282d