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

Change-Id: I4e6b2ea56e3e97fe8bc15424decd19e26085e5f0