Merge "storageproxyd: Remove duplicate interface definition" into main am: 4cd076ad1f

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

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