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

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

Change-Id: I604d0cd9af39cbc70b28a174bca29a7715a6e436