Merge "installd: fix build with ToT LLVM" into main am: d2e8444c88 am: f4d3fb18ad

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

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