Merge "Merge "Fix NPE in isTrimmable" into rvc-dev am: a759c596fa am: 6d9ba69697" into rvc-d1-dev-plus-aosp