Merge "Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-dev am: 8abe600b81 am: 4fea890c18 am: f97b567234 am: 3b0124864c am: ff4ad59458 am: 2d870152d9" into qt-r1-dev-plus-aosp