Merge commit 'e6f91a99be1816f13ea923eb21edd58ca403ab89' of sso://googleplex-android/platform/external/rust/crates/serde_json into HEAD
Change-Id: I9335367f3c37daf5fd0654aa5d163def044fb9e6