Merge "storaged: Fix deprecated usages of protobuf API." am: 27bccbfdef am: 147d5e1a6a am: f0c98d4c60 am: b58687894b

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

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