Merge "Fix train info 32 to 64 bit upgrade" am: 06c2b0938c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/StatsD/+/2200208

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