Merge "Remove package private method access from LinearLayoutManager" into lmp-mr1-ub-dev