am 0dfb3f46: Merge "In CTS EglConfigTest, keep screen on to prevent test stuck." into klp-modular-dev

* commit '0dfb3f463d23786f488aa07a64b4ae58f87aa015':
  In CTS EglConfigTest, keep screen on to prevent test stuck.