Keep primitive members used by MessageUtils. am: 88edc35d am: 6d14649d

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



Change-Id: I88401722fa43e7f8beccae6495411712349f6f35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>