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

Change-Id: I3ab6bbf65d6b78f5cb5a6a544952afd43b4b2c7b