Merge "CtsLeanbackJank: fix focus and pre-scroll delay." into pie-cts-dev
am: 18c6306249

Change-Id: Ibd7565a23b59641409d82d76ad020352f60e7a43