Merge "Fix android.util.CloseGuard sample usage" am: 7381525076 am: 66b0e7d150 am: 16257918c9

Change-Id: I23ca1a8ca61e62b20c5b5eff0c7e9ef10c2e6711