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

Change-Id: I9c7e7c800ba80aee03323d35ff83aa490f0aacd6