DO NOT MERGE - CTS for display mode switches.

b/18241736

Change-Id: I80bd8673085bd0cb324d854c1877687de2a044a4
(cherry picked from commit 288bc63e6df30e27de8078d7279393422aa2b130)
3 files changed