am 3f906438: Merge "Add CtsVerifier\'s initial support for Android TV (LEANBACK_LAUNCHER category). Also make some features that are not strictly required in L optional; this is mainly for ATV/Leanback." into lmp-dev

* commit '3f906438f5f6788450e7830dc7b8499984735f6b':
  Add CtsVerifier's initial support for Android TV (LEANBACK_LAUNCHER category). Also make some features that are not strictly required in L optional; this is mainly for ATV/Leanback.