Merge cherrypicks of ['googleplex-android-review.googlesource.com/36456975'] into security-aosp-24Q3-release.

Change-Id: I333cd668724a0a453164ec61e1218d15870b3157

drm/common/IDrmManagerService.cpp

diff --git a/drm/common/IDrmManagerService.cpp b/drm/common/IDrmManagerService.cpp
index 1b49be1..c5a845a 100644
--- a/drm/common/IDrmManagerService.cpp
+++ b/drm/common/IDrmManagerService.cpp
@@ -1001,10 +1001,8 @@
             }
             const String8 key(data.readString8());
             if (key == String8("FileDescriptorKey")) {
-                char buffer[16];
                 int fd = data.readFileDescriptor();
-                sprintf(buffer, "%lu", (unsigned long)fd);
-                drmInfoRequest->put(key, String8(buffer));
+                drmInfoRequest->put(key, String8::format("%d", fd));
             } else {
                 const String8 value(data.readString8());
                 drmInfoRequest->put(key, (value == String8("NULL")) ? String8("") : value);