Merge "Add NearbyDeviceParcelable to PresenceDevice conversion in NearbyManager Add empty salt field in callers." into tm-dev