Merge "[GATT] Ensure synchronized when adding a value"

        }

        synchronized (mAppsLock) {

            AppAdvertiseStats appAdvertiseStats = mAppAdvertiseStats.get(id);

            if (appAdvertiseStats == null) {

                appAdvertiseStats = new AppAdvertiseStats(appUid, id, appName, this, service);

            synchronized (this) {

                if (!mAppAdvertiseStats.containsKey(id)) {

                    AppAdvertiseStats appAdvertiseStats =

                            new AppAdvertiseStats(appUid, id, appName, this, service);

                    mAppAdvertiseStats.put(id, appAdvertiseStats);

                }

            }

            App app = getById(appUid);

            if (app == null) {

                app = new App(appUid, callback, appName);