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

Change-Id: I9a141b1b9150385daa545d8b364528905d4025c7