Merge "Revert "Close TaskSnapshot hardware buffer before remove from cache."" into main

package com.android.server.wm;

import android.annotation.Nullable;

import android.hardware.HardwareBuffer;

import android.util.ArrayMap;

import android.window.TaskSnapshot;

            if (entry != null) {

                mAppIdMap.remove(entry.topApp);

                mRunningCache.remove(id);

                final HardwareBuffer buffer = entry.snapshot.getHardwareBuffer();

                if (buffer != null) {

                    buffer.close();

                }

            }

        }

    }