Merge "Make sys_resource test more robust." into lollipop-cts-dev