Merge "Fix Rust string parceling" am: c4224afa39 am: 0c77408688 am: d28b11ce5e

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

Change-Id: I1128cf7149b42b6a4cc1b15e9ac612c9f2ea6ccb