Merge "Merge "Added some optimizations to the CTS leanback jank test app." into nougat-cts-dev am: 4c1b10f00e" into nougat-mr1-cts-dev
am: d94352b454

Change-Id: I716b2a7149b948aef13ba84a2a0020bed963b248