Merge "Add leanback support to AppCompatiblityTest" into lmp-dev