Merge "Delay marquee scrolling on lockscreen by 2 seconds." into oc-dr1-dev am: 331a287656
am: 3c778dc07a

Change-Id: I59b79e4591868ebd02a5a6f231b092290a878781