Merge "Upgrade proc-macro2 to 1.0.47" am: 625c45bf46 am: 7e2af67865 am: 2738cc5af5

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/2346146

Change-Id: I6152e3f9725dc0d508b6ecbfcb878d8f9e0be9dd
Signed-off-by: Automerger Merge Worker <[email protected]>