Merge "Error fix from enabling Clang thread-safety checks" into main

Author: eprucka3

services/surfaceflinger/tests/unittests/FrameTimelineTest.cpp

@@ -158,6 +158,7 @@ class FrameTimelineTest : public testing::Test {
                 a.presentTime == b.presentTime;
     }
 
+    NO_THREAD_SAFETY_ANALYSIS
     const std::map<int64_t, TimelineItem>& getPredictions() const {
         return mTokenManager->mPredictions;
     }