Merge "Add clean up code into a flag" into main

                } else {

                    int handle = mSensorEventBuffer[i].dynamic_sensor_meta.handle;

                    disconnectDynamicSensor(handle, activeConnections);

                    if (sensorservice_flags::

                            sensor_service_clear_dynamic_sensor_data_at_the_end()) {

                      device.cleanupDisconnectedDynamicSensor(handle);

                    }

                }

            }

        }

        // Send our events to clients. Check the state of wake lock for each client and release the

        // lock if none of the clients need it.