Merge "Merge "DividerView choreographer set earlier to avoid null exception"...
Merge "Merge "DividerView choreographer set earlier to avoid null exception" into oc-dev am: 9c4b6d3b" into oc-dev-plus-aosp
am: aa7e6a0d
Change-Id: If55011d13b78b80fc0eafbaa484f180a6eff0524