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

Change-Id: Ide5a252312a4b0ae7d410f476ba9e2e02566c4bc