Merge "Merge "Fix NPE in isTrimmable" into rvc-dev am: a759c596fa am: 6a1dbea74a am: c710d47870" into rvc-qpr-dev-plus-aosp am: 8336c51aa2

Change-Id: I762174ea9c1523b3e172dc58b7592154b71473a4