Merge "binder RPC: quick callbacks flake" into main am: 12a57e3

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3453370

Change-Id: Ie160d0aeeaf46968ac89a74672c46f3e053621d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Author: Treehugger Robot

libs/binder/tests/binderRpcUniversalTests.cpp

@@ -498,9 +498,9 @@ TEST_P(BinderRpc, Callbacks) {
                 // same thread, everything should have happened in a nested call. Otherwise,
                 // the callback will be processed on another thread.
                 if (callIsOneway || callbackIsOneway || delayed) {
-                    using std::literals::chrono_literals::operator""s;
+                    using std::literals::chrono_literals::operator""ms;
                     RpcMutexUniqueLock _l(cb->mMutex);
-                    cb->mCv.wait_for(_l, 1s, [&] { return !cb->mValues.empty(); });
+                    cb->mCv.wait_for(_l, 1500ms, [&] { return !cb->mValues.empty(); });
                 }
 
                 EXPECT_EQ(cb->mValues.size(), 1UL)