Merge "Implement CloseGuard in ContentResolver."