Merge "Support non-disposed render in tests am: d84e1ead52 am: 165bb7ded3" into rvc-d1-dev-plus-aosp