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

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

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