Merge "Fix NearbyDeviceParcelable read and write bug" into tm-dev am: 002d199a5b

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

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