Merge "Support CATEGORY_LEANBACK_LAUNCHER on tv devices." into pi-dev am: f3f86dd09e
am: 9f73182dfa

Change-Id: I7e86dbdc4d194890174b72b41ac09f306a26122c