Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into pi-dev am: a94d8aed24
am: 2c8f7e6ae8

Change-Id: I2375c1b4bc262803ce2846bc1884a85524664189