Merge "Make isSameTrustConfiguration public API" into pi-dev am: eed55b3b15
am: 1c0e63f2fd

Change-Id: Ia13d109226724c6c124bbfaa996ba3fe966b46fb