Merge "storageproxyd: Fix x86 builds" into main am: bbdc19b7 am: 2b029e30

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3053402



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