Merge "Merge "DividerView choreographer set earlier to avoid null exception" into oc-dev am: 9c4b6d3bff" into oc-dev-plus-aosp