leanback LM: Fix unnecessary prepended when there is margin

Also converted Grid test cases to use AndroidJUnit4.

Bug 30404474

Change-Id: Ia4a5b2d625a445ebb4db847a2ba5fcca9d47a9c1
4 files changed