Merge "Attempt to fix presubmit failure"

            final int callingUid = Binder.getCallingUid();

            final long token = Binder.clearCallingIdentity();

            try {

                synchronized (mSyncRoot) {

                    return mLogicalDisplayMapper.getDisplayIdsLocked(callingUid);

                }

            } finally {

                Binder.restoreCallingIdentity(token);

            }