Merge "Fix android.util.CloseGuard sample usage"
am: 7381525076

Change-Id: I4e69d9638ca69be5896bfeb0c3d950d340294cb5